Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 16 Oct 2011 01:47:10 +0000 (18:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 16 Oct 2011 01:47:10 +0000 (18:47 -0700)

Trivial merge